Same panic() behaviour as native Linux when running as domain 0.

That is, no reboot: just sit there and flash the keyboard LEDs.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
index 6e3a87ae5b3cda33310e004446cba34de068f204..8a83da25e7a8f74effa8f059eb91f4e951d8bb8b 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
@@ -1633,9 +1633,9 @@ void __init setup_arch(char **cmdline_p)
        physdev_op_t op;
        unsigned long max_low_pfn;
 
-       /* Force a quick death if the kernel panics. */
+       /* Force a quick death if the kernel panics (not domain 0). */
        extern int panic_timeout;
-       if (panic_timeout == 0)
+       if (!panic_timeout && !(xen_start_info->flags & SIF_INITDOMAIN))
                panic_timeout = 1;
 
        /* Register a call for panic conditions. */